<!DOCTYPE html>
<!-- saved from url=(0392)http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en -->
<html lang="en" dir="ltr" class="js no-touch localstorage sessionstorage contenteditable use-opacity-transitions"><!--<![endif]--><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <title>Disqus Comments</title>

    
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">

    <style>
        .alert--warning {
            border-radius: 3px;
            padding: 10px 15px;
            margin-bottom: 10px;
            background-color: #FFE070;
            color: #A47703;
        }

        .alert--warning a,
        .alert--warning a:hover,
        .alert--warning strong {
            color: #A47703;
            font-weight: bold;
        }

        .alert--error p,
        .alert--warning p {
            margin-top: 5px;
            margin-bottom: 5px;
        }
        
        </style>
    
    <style>
        html {
            overflow: hidden;
        }

        #error {
            display: none;
        }

        .clearfix:after {
            content: "";
            display: block;
            height: 0;
            clear: both;
            visibility: hidden;
        }

        
    </style>

<link rel="stylesheet" href="lounge.f668c82e65f78693a6a62a5c7d3e54b8.css"><script type="text/javascript" charset="utf-8" async="" data-requirecontext="_" data-requiremodule="remote/config" src="config.js"></script><script type="text/javascript" charset="utf-8" async="" data-requirecontext="_" data-requiremodule="common.bundle" src="common.bundle.cf5b3da6bc5ea0f1b1377a006d29654b.js"></script><script type="text/javascript" charset="utf-8" async="" data-requirecontext="_" data-requiremodule="lounge.bundle" src="lounge.bundle.ce0579b8c8c2790209dff6d5381f76c4.js"></script><style id="css_1463573900040"></style><!--<base target="_parent">--><base href="." target="_parent"><link rel="stylesheet" href="discovery.449c10a436c997c3eee5afd5021da3a2.css"><script type="text/javascript" charset="utf-8" async="" data-requirecontext="_" data-requiremodule="ga" src="ga.js"></script><script type="text/javascript" charset="utf-8" async="" data-requirecontext="_" data-requiremodule="discovery/main" src="discovery.bundle.31a4752f15c04d6e629af3708c39d50e.js"></script></head>
<body>
    

    
    <!--[if lt IE 10]><div class="alert--warning">
        <p>You're using a browser that Disqus plans to stop supporting soon. For more information, visit our list of
        <a href="https://help.disqus.com/customer/portal/articles/466228-which-browsers-does-disqus-work-with-" style="color: #fff; text-decoration: underline;">supported browsers</a>
        and consider upgrading.</p>
    </div><![endif]-->
    <div id="error" class="alert--error">
        <p>We were unable to load Disqus. If you are a moderator please see our <a href="https://docs.disqus.com/help/83/"> troubleshooting guide</a>. </p>
    </div>

    
    <script type="text/json" id="disqus-forumData">{"session":{"canModerate":false,"audienceSyncVerified":false,"mustVerify":false,"canReply":true,"mustVerifyEmail":false},"features":{},"forum":{"category":"Culture","description":null,"founder":"32447677","twitterName":null,"url":"http://hub.tutsplus.com/","raw_description":null,"guidelines":null,"favicon":{"permalink":"http://disqus.com/api/forums/favicons/tutshub.jpg","cache":"//a.disquscdn.com/uploads/forums/235/8350/favicon.png"},"raw_guidelines":null,"language":"en","daysThreadAlive":0,"avatar":{"small":{"permalink":"http://disqus.com/api/forums/avatars/tutshub.jpg?size=32","cache":"//a.disquscdn.com/1463515638/images/noavatar32.png"},"large":{"permalink":"http://disqus.com/api/forums/avatars/tutshub.jpg?size=92","cache":"//a.disquscdn.com/1463515638/images/noavatar92.png"}},"channel":null,"daysAlive":0,"pk":"2358350","signedUrl":"http://disq.us/?url=http%3A%2F%2Fhub.tutsplus.com%2F&key=OJGqYF1qkXe4tYgyCdSScA","settings":{"supportLevel":3,"adsDRNativeEnabled":false,"disable3rdPartyTrackers":false,"adsVideoEnabled":false,"adsProductVideoEnabled":false,"adsPositionTopEnabled":false,"ssoRequired":false,"linkAffiliationEnabled":false,"adsProductLinksThumbnailsEnabled":false,"adsProductStoriesEnabled":false,"organicDiscoveryEnabled":false,"allowMedia":true,"discoveryMax":false,"discoveryLocked":false,"moderatorText":"","adsEnabled":false,"allowAnonPost":false,"hasCustomAvatar":false,"adultContent":false,"promotedDiscoveryEnabled":false,"allowAnonVotes":false,"mustVerify":true,"colorScheme":"auto","adsSettingsLocked":false,"mustVerifyEmail":true,"audienceSyncEnabled":false,"typeface":"auto","adsPositionBottomEnabled":false,"mediaembedEnabled":true,"adsProductLinksEnabled":false,"discoveryThumbnailsEnabled":false,"isVIP":false},"id":"tutshub","createdAt":"2013-05-23T02:09:36.538339","name":"Tuts+ Hub"}}</script>

    
    <script type="text/json" id="disqus-threadData">{"cursor":{"hasPrev":false,"prev":null,"total":19,"hasNext":false,"next":"1:0:0"},"code":0,"response":{"lastModified":1441313995,"posts":[{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"samaybhavsar","about":"","name":"Samay Bhavsar","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.232418,"profileUrl":"https://disqus.com/by/samaybhavsar/","url":"http://samay.info","reputation":1.232418,"location":"Ahmedabad, India","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fsamay.info&key=7D_12tyIJmq3kcTz0ACXdw","isPrimary":true,"joinedAt":"2014-12-01T18:38:44","id":"134066410","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/samaybhavsar.jpg","cache":"//a.disquscdn.com/uploads/users/13406/6410/avatar32.jpg?1417459406"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/samaybhavsar.jpg","cache":"//a.disquscdn.com/uploads/users/13406/6410/avatar92.jpg?1417459406","large":{"permalink":"http://disqus.com/api/users/avatars/samaybhavsar.jpg","cache":"//a.disquscdn.com/uploads/users/13406/6410/avatar92.jpg?1417459406"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Have been using Vincent Driessen's Git Flow. Pretty neat and helpful.","createdAt":"2014-12-01T18:43:08","id":"1720623333","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":3,"isEdited":false,"message":"\u003cp>Have been using Vincent Driessen's Git Flow. Pretty neat and helpful.\u003c/p>","isSpam":false,"isHighlighted":false,"points":3},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"asmerkin","about":"Desarrollador web, hacker de la vida y emprendedor. ","name":"Andr\u00e9s Smerkin","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.2466789999999999,"profileUrl":"https://disqus.com/by/asmerkin/","url":"http://www.andressmerkin.com/","reputation":1.2466789999999999,"location":"Mendoza, Argentina","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fwww.andressmerkin.com%2F&key=32X-SllgsCLHOiBdNvGz8Q","isPrimary":true,"joinedAt":"2008-10-02T18:47:36","id":"112673","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/asmerkin.jpg","cache":"//a.disquscdn.com/uploads/users/11/2673/avatar32.jpg?1460584746"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/asmerkin.jpg","cache":"//a.disquscdn.com/uploads/users/11/2673/avatar92.jpg?1460584746","large":{"permalink":"http://disqus.com/api/users/avatars/asmerkin.jpg","cache":"//a.disquscdn.com/uploads/users/11/2673/avatar92.jpg?1460584746"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Very good article :) Thank you!","createdAt":"2014-12-01T19:24:34","id":"1720686448","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":1,"isEdited":false,"message":"\u003cp>Very good article :) Thank you!\u003c/p>","isSpam":false,"isHighlighted":false,"points":1},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"tyroneavnit","about":"Software Engineer","name":"Tyrone Avnit","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.250461,"profileUrl":"https://disqus.com/by/tyroneavnit/","url":"http://tyronemichael.com","reputation":1.250461,"location":"South Africa","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Ftyronemichael.com&key=AFAaC0cVaGkl_XjCaRJyuQ","isPrimary":true,"joinedAt":"2013-02-26T14:26:16","id":"44494479","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/tyroneavnit.jpg","cache":"//a.disquscdn.com/uploads/users/4449/4479/avatar32.jpg?1402848462"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/tyroneavnit.jpg","cache":"//a.disquscdn.com/uploads/users/4449/4479/avatar92.jpg?1402848462","large":{"permalink":"http://disqus.com/api/users/avatars/tyroneavnit.jpg","cache":"//a.disquscdn.com/uploads/users/4449/4479/avatar92.jpg?1402848462"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Great article with great tips. Thank you.","createdAt":"2014-12-01T14:41:31","id":"1720252533","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":1,"isEdited":false,"message":"\u003cp>Great article with great tips. Thank you.\u003c/p>","isSpam":false,"isHighlighted":false,"points":1},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"samuelimolorhe","about":"designer, developer, git enthusiast","name":"Samuel Imolorhe","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.234067,"profileUrl":"https://disqus.com/by/samuelimolorhe/","url":"","reputation":1.234067,"location":"Lagos, NG","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2015-01-03T00:22:19","id":"137813143","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/samuelimolorhe.jpg","cache":"//a.disquscdn.com/uploads/users/13781/3143/avatar32.jpg?1449587925"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/samuelimolorhe.jpg","cache":"//a.disquscdn.com/uploads/users/13781/3143/avatar92.jpg?1449587925","large":{"permalink":"http://disqus.com/api/users/avatars/samuelimolorhe.jpg","cache":"//a.disquscdn.com/uploads/users/13781/3143/avatar92.jpg?1449587925"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Hi. Lovely article! Been looking for something like this for a while now. Currently using the git-flow feature in Bitbucket's SourceTree as a way to take care of any mistakes that any of the developers could make. However, it seems to ensure that the workflow is exactly the way Vincent Driessen defined it to be in his article. Just need to get another opinion on this. Specifically because it doesn't enforce pull requests, which I would love, or the ability to have phase-specific branches in a multi-phased rollout. However, we just started using Git recently and most of the developers are still trying to get the hang of it, hence the decision to use the git-flow feature to ease the process. Thanks.","createdAt":"2015-01-03T00:22:38","id":"1769300739","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Hi. Lovely article! Been looking for something like this for a while now. Currently using the git-flow feature in Bitbucket's SourceTree as a way to take care of any mistakes that any of the developers could make. However, it seems to ensure that the workflow is exactly the way Vincent Driessen defined it to be in his article. Just need to get another opinion on this. Specifically because it doesn't enforce pull requests, which I would love, or the ability to have phase-specific branches in a multi-phased rollout. However, we just started using Git recently and most of the developers are still trying to get the hang of it, hence the decision to use the git-flow feature to ease the process. Thanks.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"marioaraque","about":"","name":"Mario Araque","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.244246,"profileUrl":"https://disqus.com/by/marioaraque/","url":"http://marioaraque.com/","reputation":1.244246,"location":"Spain","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fmarioaraque.com%2F&key=WqF7UCS-xgRWl_4hH6rvMQ","isPrimary":true,"joinedAt":"2013-05-20T14:50:59","id":"51318756","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/marioaraque.jpg","cache":"//a.disquscdn.com/uploads/users/5131/8756/avatar32.jpg?1457978300"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/marioaraque.jpg","cache":"//a.disquscdn.com/uploads/users/5131/8756/avatar92.jpg?1457978300","large":{"permalink":"http://disqus.com/api/users/avatars/marioaraque.jpg","cache":"//a.disquscdn.com/uploads/users/5131/8756/avatar92.jpg?1457978300"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Very nice article!\n\n\nI have a question about code review, what do you think about rebase after you get the \"+1\" (or thumbs up). It's very common to do commits in my branch, and then rebase it into one after \"+1\". The result is only one commit per feature.\n\n\nRegards.","createdAt":"2014-12-11T14:07:41","id":"1736743953","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Very nice article!\u003c/p>\u003cp>I have a question about code review, what do you think about rebase after you get the \"+1\" (or thumbs up). It's very common to do commits in my branch, and then rebase it into one after \"+1\". The result is only one commit per feature.\u003c/p>\u003cp>Regards.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1736743953,"isApproved":true,"author":{"username":"redhotvengeance","about":"","name":"Ian Lollar","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.239256,"profileUrl":"https://disqus.com/by/redhotvengeance/","url":"http://redhotvengeance.com/","reputation":1.239256,"location":"","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fredhotvengeance.com%2F&key=h3W7BHhAntRG6N98JV7BMw","isPrimary":true,"joinedAt":"2012-06-22T04:40:02","id":"27772796","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar32.jpg?1346772323"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323","large":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Sure, you could do that. Ultimately, the PR branch is going to be thrown away anyway. But the key is that you'll be doing it with the understanding that no one else is working in the PR branch, otherwise they will be dealing with a rewritten history and likely not thank you for that ;)\n\n\nSounds like you may also be squashing your commits so that each feature winds up as a single commit. That's certainly a viable flow. I prefer each commit to focused on a single task. If a new feature is very small, then it could easily be a single commit. On the other hand, a larger feature is likely made up of many sub-tasks, and I would have each of those sub-tasks be their own commit. This is a personal preference - I just think it makes for an easier time when looking at commit diffs.","createdAt":"2014-12-30T02:22:42","id":"1763979592","thread":"3279526792","depth":1,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Sure, you could do that. Ultimately, the PR branch is going to be thrown away anyway. But the key is that you'll be doing it with the understanding that no one else is working in the PR branch, otherwise they will be dealing with a rewritten history and likely not thank you for that ;)\u003c/p>\u003cp>Sounds like you may also be squashing your commits so that each feature winds up as a single commit. That's certainly a viable flow. I prefer each commit to focused on a single task. If a new feature is very small, then it could easily be a single commit. On the other hand, a larger feature is likely made up of many sub-tasks, and I would have each of those sub-tasks be their own commit. This is a personal preference - I just think it makes for an easier time when looking at commit diffs.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"disqus_VoAsAbTaXv","about":"","name":"Akin T.","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.2324929999999998,"profileUrl":"https://disqus.com/by/disqus_VoAsAbTaXv/","url":"","reputation":1.2324929999999998,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2014-12-05T21:13:59","id":"134605188","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/disqus_VoAsAbTaXv.jpg","cache":"//a.disquscdn.com/1463515638/images/noavatar32.png"},"isCustom":false,"permalink":"http://disqus.com/api/users/avatars/disqus_VoAsAbTaXv.jpg","cache":"//a.disquscdn.com/1463515638/images/noavatar92.png","large":{"permalink":"http://disqus.com/api/users/avatars/disqus_VoAsAbTaXv.jpg","cache":"//a.disquscdn.com/1463515638/images/noavatar92.png"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Nice! That's what I've been looking for...","createdAt":"2014-12-05T21:14:40","id":"1727819521","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Nice! That's what I've been looking for...\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"evanmcd","about":"","name":"evanmcd","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.2350759999999998,"profileUrl":"https://disqus.com/by/evanmcd/","url":"","reputation":1.2350759999999998,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2011-12-08T03:27:59","id":"19930354","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/evanmcd.jpg","cache":"//a.disquscdn.com/uploads/users/1993/354/avatar32.jpg?1460145522"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/evanmcd.jpg","cache":"//a.disquscdn.com/uploads/users/1993/354/avatar92.jpg?1460145522","large":{"permalink":"http://disqus.com/api/users/avatars/evanmcd.jpg","cache":"//a.disquscdn.com/uploads/users/1993/354/avatar92.jpg?1460145522"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Thanks for a great article.\n\n\nIt's probably my lack of understanding, but wouldn't creating feature branches of dev mean that code that may not be ready for production get deployed?  e.g. dev 1 creates feature A and merges with develop branch; dev 2 creates feature B off of develop; feature B is ready before feature A, but since feature B came off of develop where feature B existed it gets merged to master along with feature B?\n\n\nMy guess is that you've accounted for that in this flow, but I'm not clear how.","createdAt":"2014-12-04T16:25:57","id":"1725587814","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Thanks for a great article.\u003c/p>\u003cp>It's probably my lack of understanding, but wouldn't creating feature branches of dev mean that code that may not be ready for production get deployed?  e.g. dev 1 creates feature A and merges with develop branch; dev 2 creates feature B off of develop; feature B is ready before feature A, but since feature B came off of develop where feature B existed it gets merged to master along with feature B?\u003c/p>\u003cp>My guess is that you've accounted for that in this flow, but I'm not clear how.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1725587814,"isApproved":true,"author":{"username":"redhotvengeance","about":"","name":"Ian Lollar","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.239256,"profileUrl":"https://disqus.com/by/redhotvengeance/","url":"http://redhotvengeance.com/","reputation":1.239256,"location":"","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fredhotvengeance.com%2F&key=h3W7BHhAntRG6N98JV7BMw","isPrimary":true,"joinedAt":"2012-06-22T04:40:02","id":"27772796","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar32.jpg?1346772323"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323","large":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"As with all things, team communication is key. If you are currently working on a multi-phased rollout (wherein certain features are being slated for specific releases), immediately merging all feature branches into develop would be an improper flow. Instead, I'd suggest a couple of alternative options:\n\n\n1. Keep new features not slated for the next release in their feature branches, and don't merge until that feature is \"on deck\" for release. In this instance, you should definitely be pushing those feature branches to the remote, if for no other reason than to have them backed up.\n2. Forgo having a single \"develop\" branch, and instead have phase-specific branches that serve as the trunk for that specific phase. As you move from one phase to the other, alert the team as to when they should start merging into the next phase's branch, and then retire phase branches that have been shipped.\n\n\nA worthwhile modification to the first option is to include a strongly pull request-based flow, wherein all merges must be initiated by a pull request, and only key team members can approve the merge. That way someone keeping an eye on product roadmap at large can appropriately authorize when a new feature should be merged into develop.","createdAt":"2014-12-04T22:48:57","id":"1726216347","thread":"3279526792","depth":1,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>As with all things, team communication is key. If you are currently working on a multi-phased rollout (wherein certain features are being slated for specific releases), immediately merging all feature branches into develop would be an improper flow. Instead, I'd suggest a couple of alternative options:\u003c/p>\u003cp>1. Keep new features not slated for the next release in their feature branches, and don't merge until that feature is \"on deck\" for release. In this instance, you should definitely be pushing those feature branches to the remote, if for no other reason than to have them backed up.\u003cbr>2. Forgo having a single \"develop\" branch, and instead have phase-specific branches that serve as the trunk for that specific phase. As you move from one phase to the other, alert the team as to when they should start merging into the next phase's branch, and then retire phase branches that have been shipped.\u003c/p>\u003cp>A worthwhile modification to the first option is to include a strongly pull request-based flow, wherein all merges must be initiated by a pull request, and only key team members can approve the merge. That way someone keeping an eye on product roadmap at large can appropriately authorize when a new feature should be merged into develop.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"davetgreen","about":"","name":"Dave Green","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.247552,"profileUrl":"https://disqus.com/by/davetgreen/","url":"http://www.davetgreen.me/","reputation":1.247552,"location":"Manchester, UK","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fwww.davetgreen.me%2F&key=MRzy-6aXwHTFrEsfAXw4gg","isPrimary":true,"joinedAt":"2010-09-22T11:43:56","id":"4460233","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/davetgreen.jpg","cache":"//a.disquscdn.com/uploads/users/446/233/avatar32.jpg?1452859332"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/davetgreen.jpg","cache":"//a.disquscdn.com/uploads/users/446/233/avatar92.jpg?1452859332","large":{"permalink":"http://disqus.com/api/users/avatars/davetgreen.jpg","cache":"//a.disquscdn.com/uploads/users/446/233/avatar92.jpg?1452859332"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Brilliant read. I've always been ensure as to what the best approach is so this has cleared that up for good. Cheers!","createdAt":"2014-12-04T09:21:24","id":"1725116118","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Brilliant read. I've always been ensure as to what the best approach is so this has cleared that up for good. Cheers!\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"ds1982","about":"","name":"ds1982","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.237215,"profileUrl":"https://disqus.com/by/ds1982/","url":"","reputation":1.237215,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2012-09-10T08:53:19","id":"31904915","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/ds1982.jpg","cache":"//a.disquscdn.com/uploads/users/3190/4915/avatar32.jpg?1427627322"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/ds1982.jpg","cache":"//a.disquscdn.com/uploads/users/3190/4915/avatar92.jpg?1427627322","large":{"permalink":"http://disqus.com/api/users/avatars/ds1982.jpg","cache":"//a.disquscdn.com/uploads/users/3190/4915/avatar92.jpg?1427627322"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"> git merge --no-ff develop\n\n\nI highly disagree with this. This way, git creates a \"real\" merge commit what is usually not what you want if you work with a rebase-based workflow. We even configured our gitolite in a way, that it rejects all pushes with merge commits. This makes it easier to ensure that everybody rebases..\n\n\nIf you need a commit that marks your merge (we need that sometimes, too), we make an empty commit:\n\n\ngit commit --allow-empty -m \"merge feature hash1..hash2\"","createdAt":"2014-12-03T06:44:28","id":"1723225123","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>&gt; git merge --no-ff develop\u003c/p>\u003cp>I highly disagree with this. This way, git creates a \"real\" merge commit what is usually not what you want if you work with a rebase-based workflow. We even configured our gitolite in a way, that it rejects all pushes with merge commits. This makes it easier to ensure that everybody rebases..\u003c/p>\u003cp>If you need a commit that marks your merge (we need that sometimes, too), we make an empty commit:\u003c/p>\u003cp>git commit --allow-empty -m \"merge feature hash1..hash2\"\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"davidm777","about":"","name":"davidm777","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.184367,"profileUrl":"https://disqus.com/by/davidm777/","url":"","reputation":1.184367,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2012-03-03T16:27:04","id":"23118454","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/davidm777.jpg","cache":"//a.disquscdn.com/uploads/users/2311/8454/avatar32.jpg?1444419682"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/davidm777.jpg","cache":"//a.disquscdn.com/uploads/users/2311/8454/avatar92.jpg?1444419682","large":{"permalink":"http://disqus.com/api/users/avatars/davidm777.jpg","cache":"//a.disquscdn.com/uploads/users/2311/8454/avatar92.jpg?1444419682"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Wow - super well written article.  Very easy to read and understand.  I *really* appreciate the sample git commands as I have to (currently) work in a variety of VCSs, I don't always remember each system's commands.\n\nI do have a question.  You wrote, \"The following example is based on a very popular Git workflow crafted by Vincent Driessen called Git-Flow, though it differs in certain key ways.\"  Can you elaborate on the \"certain key ways\" as I am not really seeing any (which is why I need your elaboration - grin)?","createdAt":"2014-12-02T18:39:38","id":"1722371838","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Wow - super well written article.  Very easy to read and understand.  I *really* appreciate the sample git commands as I have to (currently) work in a variety of VCSs, I don't always remember each system's commands.\u003c/p>\u003cp>I do have a question.  You wrote, \"The following example is based on a very popular Git workflow crafted by Vincent Driessen called Git-Flow, though it differs in certain key ways.\"  Can you elaborate on the \"certain key ways\" as I am not really seeing any (which is why I need your elaboration - grin)?\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1722371838,"isApproved":true,"author":{"username":"redhotvengeance","about":"","name":"Ian Lollar","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.239256,"profileUrl":"https://disqus.com/by/redhotvengeance/","url":"http://redhotvengeance.com/","reputation":1.239256,"location":"","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fredhotvengeance.com%2F&key=h3W7BHhAntRG6N98JV7BMw","isPrimary":true,"joinedAt":"2012-06-22T04:40:02","id":"27772796","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar32.jpg?1346772323"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323","large":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Yeah, \"key ways\" may be a bit misleading, in retrospect. \"Subtle ways\" is probably more accurate. This tut introduces some flexibility by dropping the need for release branches and loosening up naming guidelines. It also outlines commit message conventions, semantic versioning, and encourages rebasing, which was left out of Vincent Driessen's Git-Flow. And there's a bit on pull request workflows, as well. But the core principles are from Git-Flow. Good eye :)","createdAt":"2014-12-02T19:27:22","id":"1722449568","thread":"3279526792","depth":1,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Yeah, \"key ways\" may be a bit misleading, in retrospect. \"Subtle ways\" is probably more accurate. This tut introduces some flexibility by dropping the need for release branches and loosening up naming guidelines. It also outlines commit message conventions, semantic versioning, and encourages rebasing, which was left out of Vincent Driessen's Git-Flow. And there's a bit on pull request workflows, as well. But the core principles are from Git-Flow. Good eye :)\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1722449568,"isApproved":true,"author":{"username":"davidm777","about":"","name":"davidm777","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.184367,"profileUrl":"https://disqus.com/by/davidm777/","url":"","reputation":1.184367,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2012-03-03T16:27:04","id":"23118454","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/davidm777.jpg","cache":"//a.disquscdn.com/uploads/users/2311/8454/avatar32.jpg?1444419682"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/davidm777.jpg","cache":"//a.disquscdn.com/uploads/users/2311/8454/avatar92.jpg?1444419682","large":{"permalink":"http://disqus.com/api/users/avatars/davidm777.jpg","cache":"//a.disquscdn.com/uploads/users/2311/8454/avatar92.jpg?1444419682"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Excellent!  Thank you for the quick reply.  I would suggest that your approach is less overwhelming for those of us who haven't done anything like this :-)  Thus my assessment \"Very easy to read and understand\"!\n\n\nThanks again for this article!","createdAt":"2014-12-02T20:08:35","id":"1722518035","thread":"3279526792","depth":2,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Excellent!  Thank you for the quick reply.  I would suggest that your approach is less overwhelming for those of us who haven't done anything like this :-)  Thus my assessment \"Very easy to read and understand\"!\u003c/p>\u003cp>Thanks again for this article!\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":null,"isApproved":true,"author":{"username":"disqus_ZdYsl4dxH8","about":"","name":"Ngoc Phan","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.233279,"profileUrl":"https://disqus.com/by/disqus_ZdYsl4dxH8/","url":"","reputation":1.233279,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2013-06-11T07:02:06","id":"56006994","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar32.jpg?1435050823"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar92.jpg?1435050823","large":{"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar92.jpg?1435050823"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"very nice, but I am not clear at one point.\n\n\"All conflict resolution should happen in your feature branch. If you branched to make a small change/fix and you have not pushed the branch to the remote,.....\"\n\nwhat does it mean \"not pushed the branch to the remote\" ? is \"the remote\" here the feature branch on remote? or develop branch on the remote in case I already rebased my local feature branch to develop and push to develop on the remote.\n\nThanks","createdAt":"2014-12-02T03:48:13","id":"1721366179","thread":"3279526792","depth":0,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>very nice, but I am not clear at one point.\u003c/p>\u003cp>\"All conflict resolution should happen in your feature branch. If you branched to make a small change/fix and you have not pushed the branch to the remote,.....\"\u003c/p>\u003cp>what does it mean \"not pushed the branch to the remote\" ? is \"the remote\" here the feature branch on remote? or develop branch on the remote in case I already rebased my local feature branch to develop and push to develop on the remote.\u003c/p>\u003cp>Thanks\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1721366179,"isApproved":true,"author":{"username":"redhotvengeance","about":"","name":"Ian Lollar","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.239256,"profileUrl":"https://disqus.com/by/redhotvengeance/","url":"http://redhotvengeance.com/","reputation":1.239256,"location":"","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fredhotvengeance.com%2F&key=h3W7BHhAntRG6N98JV7BMw","isPrimary":true,"joinedAt":"2012-06-22T04:40:02","id":"27772796","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar32.jpg?1346772323"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323","large":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"The \"remote\" is whatever server/service you're syncing your Git repo to (this article focused on BitBucket, but it could also be GitHub or any other Git hosting service, or even a personal Git server you may have set up). The passage you're questioning is saying this:\n\n\nLet's say you're sitting on the develop branch and you want to add a new feature. So you make a new branch (let's call it \"my-new-feature\") and switch to it. After working on the feature and making one or more commits, the feature is now done and ready to be merged. In its current state, the my-new-feature branch is only local, since you have not pushed it (git push origin my-new-feature). Since it is only local, you can safely rebase it (while sitting on the my-new-feature branch, git rebase develop). Then you can switch back over to the develop branch, merge my-new-feature, and push the new commits on the develop branch.\n\n\nLet me know if you have any other questions!","createdAt":"2014-12-02T06:20:01","id":"1721492855","thread":"3279526792","depth":1,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>The \"remote\" is whatever server/service you're syncing your Git repo to (this article focused on BitBucket, but it could also be GitHub or any other Git hosting service, or even a personal Git server you may have set up). The passage you're questioning is saying this:\u003c/p>\u003cp>Let's say you're sitting on the develop branch and you want to add a new feature. So you make a new branch (let's call it \"my-new-feature\") and switch to it. After working on the feature and making one or more commits, the feature is now done and ready to be merged. In its current state, the my-new-feature branch is only local, since you have not pushed it (git push origin my-new-feature). Since it is only local, you can safely rebase it (while sitting on the my-new-feature branch, git rebase develop). Then you can switch back over to the develop branch, merge my-new-feature, and push the new commits on the develop branch.\u003c/p>\u003cp>Let me know if you have any other questions!\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1721492855,"isApproved":true,"author":{"username":"disqus_ZdYsl4dxH8","about":"","name":"Ngoc Phan","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.233279,"profileUrl":"https://disqus.com/by/disqus_ZdYsl4dxH8/","url":"","reputation":1.233279,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2013-06-11T07:02:06","id":"56006994","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar32.jpg?1435050823"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar92.jpg?1435050823","large":{"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar92.jpg?1435050823"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"And then  I found that I want to add some more things let's say functions to my-new-feature branch. I checkout to it, and make changes. then can I still rebase develop to my-new-feature?","createdAt":"2014-12-02T07:11:16","id":"1721527532","thread":"3279526792","depth":2,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>And then  I found that I want to add some more things let's say functions to my-new-feature branch. I checkout to it, and make changes. then can I still rebase develop to my-new-feature?\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1721527532,"isApproved":true,"author":{"username":"redhotvengeance","about":"","name":"Ian Lollar","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.239256,"profileUrl":"https://disqus.com/by/redhotvengeance/","url":"http://redhotvengeance.com/","reputation":1.239256,"location":"","isPrivate":false,"signedUrl":"http://disq.us/?url=http%3A%2F%2Fredhotvengeance.com%2F&key=h3W7BHhAntRG6N98JV7BMw","isPrimary":true,"joinedAt":"2012-06-22T04:40:02","id":"27772796","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar32.jpg?1346772323"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323","large":{"permalink":"http://disqus.com/api/users/avatars/redhotvengeance.jpg","cache":"//a.disquscdn.com/uploads/users/2777/2796/avatar92.jpg?1346772323"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"Sure. So long as you haven't actually pushed my-new-feature to the remote, then that's fine. Look at it this way: you should never execute a rebase while sitting on any branch that also exists on the remote. If you're sitting on master, then no rebasing, because master exists on the remote. Same with develop (if you're following the workflow in this tut). But since my-new-feature doesn't exist on the remote (since you haven't pushed it yet), then you can rebase.","createdAt":"2014-12-02T07:23:40","id":"1721536725","thread":"3279526792","depth":3,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>Sure. So long as you haven't actually pushed my-new-feature to the remote, then that's fine. Look at it this way: you should never execute a rebase while sitting on any branch that also exists on the remote. If you're sitting on master, then no rebasing, because master exists on the remote. Same with develop (if you're following the workflow in this tut). But since my-new-feature doesn't exist on the remote (since you haven't pushed it yet), then you can rebase.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0},{"forum":"tutshub","parent":1721536725,"isApproved":true,"author":{"username":"disqus_ZdYsl4dxH8","about":"","name":"Ngoc Phan","disable3rdPartyTrackers":false,"isPowerContributor":false,"isAnonymous":false,"rep":1.233279,"profileUrl":"https://disqus.com/by/disqus_ZdYsl4dxH8/","url":"","reputation":1.233279,"location":"","isPrivate":false,"signedUrl":"","isPrimary":true,"joinedAt":"2013-06-11T07:02:06","id":"56006994","avatar":{"small":{"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar32.jpg?1435050823"},"isCustom":true,"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar92.jpg?1435050823","large":{"permalink":"http://disqus.com/api/users/avatars/disqus_ZdYsl4dxH8.jpg","cache":"//a.disquscdn.com/uploads/users/5600/6994/avatar92.jpg?1435050823"}}},"media":[],"isDeleted":false,"isFlagged":false,"dislikes":0,"raw_message":"thank you very very very much. Now it is clear for me.","createdAt":"2014-12-02T08:41:49","id":"1721592109","thread":"3279526792","depth":4,"numReports":0,"isDeletedByAuthor":false,"likes":0,"isEdited":false,"message":"\u003cp>thank you very very very much. Now it is clear for me.\u003c/p>","isSpam":false,"isHighlighted":false,"points":0}],"thread":{"feed":"https://tutshub.disqus.com/focusing_on_a_team_workflow_with_git/latest.rss","identifiers":["22514"],"dislikes":0,"likes":1,"message":"","id":"3279526792","isDeleted":false,"category":"2393650","author":"32447677","userScore":0,"userSubscription":false,"isSpam":false,"signedLink":"http://disq.us/?url=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&key=_C3NOU96IEvEdK9i6qYmzw","createdAt":"2014-12-01T13:05:59","hasStreaming":false,"raw_message":"","isClosed":false,"link":"http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514","slug":"focusing_on_a_team_workflow_with_git","forum":"tutshub","clean_title":"Focusing on a Team Workflow With Git","posts":19,"moderators":[34097793,57498235,118229348,135416615,34099695,106904745,54647100,34626699,45253741,142469935,32447677,61983543,8865108,40498679,49969818,33673787,35940380,34613405,28961374],"title":"Focusing on a Team Workflow With Git","highlightedPost":null}},"order":"popular"}</script>

    

    <div id="fixed-content"></div>


    
        
        <!--[if lte IE 8]>
<script src="//a.disquscdn.com/1463515638/build/vendor/ie8.js"></script>
<![endif]-->
<!--[if IE 9]>
<script src="//a.disquscdn.com/1463515638/build/vendor/ie9.js"></script>
<![endif]-->

        
<script type="text/json" id="disqus-urls">{
    "root":"//disqus.com",
    "next":"//a.disquscdn.com/next/current/embed"
}</script>

        <script src="lounge.load.4aca534a0baee76617eb115212993522.js" id="bootstrap-script" data-app="lounge" async=""></script>
    


<div id="layout" data-tracking-area="layout">

<div id="onboard" data-tracking-area="onboard"></div>

<div id="highlighted-post" data-tracking-area="highlighted" class="highlighted-post" style="display: none;"></div>

<div id="global-alert"></div>

<header id="main-nav" data-tracking-area="main-nav">
<nav class="nav nav-primary">
<ul>
<li class="tab-conversation active" data-role="post-count"><a class="publisher-nav-color">
<span class="comment-count">
19 comments
</span>

<span class="comment-count-placeholder">
Comments
</span>
</a>
</li>
<li class="tab-community">
<a href="https://disqus.com/home/forums/tutshub/" class="publisher-nav-color" data-action="community-sidebar" data-forum="tutshub" id="community-tab">
<span class="community-name">
<strong>Tuts+ Hub</strong>

</span>

<strong class="community-name-placeholder">Community</strong>
</a>
</li>
<li class="dropdown user-menu" data-role="logout"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="dropdown-toggle" data-toggle="dropdown">
<span class="dropdown-toggle-wrapper">

<span>
Login
</span>

</span> <span class="caret"></span>
</a>
<ul class="dropdown-menu">


<li>
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="auth:disqus">Disqus</a>
</li>
<li>
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="auth:facebook">Facebook</a>
</li>
<li>
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="auth:twitter">Twitter</a>
</li>
<li>
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="auth:google">Google</a>
</li>



</ul>
</li>
<li class="notification-menu unread" data-role="notification-menu"><a href="https://disqus.com/home/inbox/" class="notification-container" data-action="home" data-home-path="home/inbox/">
<span class="notification-icon icon-comment" aria-hidden=""></span>
<span class="notification-count" data-role="notification-count">1</span>
</a>
</li>
</ul>
</nav>
</header>

<section id="conversation" data-role="main" data-tracking-area="main">
<div class="nav nav-secondary" data-tracking-area="secondary-nav">
<ul>
<li id="recommend-button" class="recommend dropdown">
<div class="thread-likes"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="recommend" title="Recommend this discussion" class="dropdown-toggle ">
<span class="icon-heart"></span>
<span class="label label-default">Recommend</span>
<span class="label label-recommended">Recommended</span>
<span class="label label-count">1</span>
</a>
<ul class="dropdown-menu coachmark">
<li>
<h2>Discussion Recommended!</h2>
<p>Recommending means this is a discussion worth sharing. It gets shared to your followers' Disqus feeds, and gives the creator kudos!</p>
<a href="http://disqus.com/home/?utm_source=disqus_embed&utm_content=recommend_btn" class="btn btn-primary" target="_blank">
 Find More Discussions 
</a>
</li>
</ul>
</div></li>
<li id="thread-share-menu" class="dropdown share-menu hidden-sm"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="dropdown-toggle" data-toggle="dropdown" title="Share">
<span class="icon-export"></span>
<span class="label">Share</span>
</a>
<ul class="share-menu dropdown-menu">
<li class="share">Share this discussion on
<ul>
<li class="twitter">
<a data-action="share:twitter" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#">Twitter</a>
</li>
<li class="facebook">
<a data-action="share:facebook" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#">Facebook</a>
</li>
</ul>
</li>
</ul>
</li>
<li data-role="post-sort" class="dropdown sorting pull-right">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="dropdown-toggle" data-toggle="dropdown">
Sort by Best


<span class="caret"></span>
</a>
<ul class="dropdown-menu pull-right">
<li class="selected">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="sort" data-sort="popular">Best<i aria-hidden="true" class="icon-checkmark"></i></a>
</li>

<li>
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="sort" data-sort="desc">Newest<i aria-hidden="true" class="icon-checkmark"></i></a>
</li>

<li>
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="sort" data-sort="asc">Oldest<i aria-hidden="true" class="icon-checkmark"></i></a>
</li>
</ul>
</li>
</ul>
</div>

<div id="posts">
<div id="form"><form class="reply">
<div class="postbox">
<div role="alert"></div>
<div class="avatar">
<span class="user">
<img data-role="user-avatar" src="noavatar92.4549c5353ccf103d32a8b81a856576ed.png" alt="Avatar">
</span>
</div>

<div class="textarea-wrapper" data-role="textarea" dir="auto"><div><span class="placeholder">Join the discussion…</span><div class="textarea" tabindex="0" role="textbox" aria-multiline="true" contenteditable="PLAINTEXT-ONLY" data-role="editable" aria-label="Join the discussion…" style="overflow: auto; max-height: 350px;"><p><br></p></div><div style="display: none;"><ul class="suggestions">
<li class="header">
<h5>in this conversation</h5>
</li>
</ul>
</div></div>
<div data-role="drag-drop-placeholder" class="media-drag-hover" style="display: none">
<div class="drag-text">
⬇ Drag and drop your images here to upload them.
</div>
</div>
<div class="media-preview empty" data-role="media-preview"><ul data-role="media-legacy-list"></ul>
<ul data-role="media-progress-list"></ul>
<ul data-role="media-rich-list"></ul>
<div class="media-expanded empty" data-role="media-preview-expanded">
<img src="" data-role="media-preview-expanded-image" alt="Media preview placeholder">
</div>
</div>
<div class="edit-alert" role="postbox-alert"></div>
<div class="post-actions">
<ul class="wysiwyg">
<li data-role="media-uploader"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" tabindex="-1" data-action="attach" class="attach" title="Upload Images"><span>Attach</span></a>
<input type="file" data-role="media-upload" tabindex="-1" accept="image/*">
</li>
</ul>
</div>
</div>

<div data-role="login-form"><div><section class="auth-section logged-out">
<div class="connect">
<h6>Log in with</h6>
<ul data-role="login-menu" class="services login-buttons">


<li class="auth-disqus">
<button type="button" data-action="auth:disqus" title="Disqus"><i class="icon-disqus"></i></button>
</li>
<li class="auth-facebook">
<button type="button" data-action="auth:facebook" title="Facebook"><i class="icon-facebook-circle"></i></button>
</li>
<li class="auth-twitter">
<button type="button" data-action="auth:twitter" title="Twitter"><i class="icon-twitter-circle"></i></button>
</li>
<li class="auth-google">
<button type="button" data-action="auth:google" title="Google"><i class="icon-google-plus-circle"></i></button>
</li>
</ul>
</div>
<div class="guest">
<h6 class="guest-form-title">
<span class="register-text"> or sign up with Disqus </span>
<span class="guest-text"> or pick a name </span>
</h6>

<div class="what-is-disqus help-icon">
<div id="rules" class="tooltip show">
<h3>Disqus is a discussion network</h3>
<ul>
<li><span>Disqus never moderates or censors. The rules on this community are its own.</span></li>
<li><span>Your email is safe with us. It's only used for moderation and optional notifications.</span></li>
<li><span>Don't be a jerk or do anything illegal. Everything is easier that way.</span></li>
</ul>
<p class="clearfix"><a href="https://docs.disqus.com/kb/terms-and-policies/" class="btn btn-small" target="_blank">Read full terms and conditions</a></p>
</div>
</div>

<p class="input-wrapper">
<input dir="auto" type="text" placeholder="Name" name="display_name" id="view62_display_name" maxlength="30">
</p>

<div class="guest-details " data-role="guest-details">
<p class="input-wrapper">
<input dir="auto" type="email" placeholder="Email" name="email" id="view62_email">
</p>

<p class="input-wrapper">
<input dir="auto" type="password" class="register-text" placeholder="Password" name="password" id="view62_password">
</p>

<div class="acceptance-wrapper register-text">
By signing up, you agree to the Disqus <a target="_blank" href="https://help.disqus.com/customer/portal/articles/1753105-basic-rules-for-disqus-powered-profiles-and-discussions">Basic Rules</a>, <a target="_blank" href="https://help.disqus.com/customer/portal/articles/466260-terms-of-service">Terms of Service</a>, and <a target="_blank" href="https://help.disqus.com/customer/portal/articles/466259-privacy-policy">Privacy Policy</a>.
</div>
<div class="acceptance-wrapper guest-text">
By posting, you agree to the Disqus <a target="_blank" href="https://help.disqus.com/customer/portal/articles/1753105-basic-rules-for-disqus-powered-profiles-and-discussions">Basic Rules</a>, <a target="_blank" href="https://help.disqus.com/customer/portal/articles/466260-terms-of-service">Terms of Service</a>, and <a target="_blank" href="https://help.disqus.com/customer/portal/articles/466259-privacy-policy">Privacy Policy</a>.
</div>

<input type="checkbox" name="author-guest" style="display:none">

<div class="proceed" data-role="submit-btn-container">
<button type="submit" class="btn submit" aria-label="Next"><span class="icon-proceed"></span><div class="spinner"></div></button>
</div>
</div>
</div>
</section>

</div></div>
</div>
</form></div>

<button class="alert realtime" style="display: none" data-role="realtime-notification">
</button>

<div id="no-posts" style="display:none"></div>

<ul id="post-list" class="post-list"><li class="post" id="post-1720623333"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/samaybhavsar/" class="user" data-action="profile" data-username="samaybhavsar">
<img data-role="user-avatar" data-user="134066410" src="avatar92.jpg" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/samaybhavsar/" data-action="profile" data-username="samaybhavsar" data-role="username">Samay Bhavsar</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1720623333" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 2:43 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Have been using Vincent Driessen's Git Flow. Pretty neat and helpful.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-3" data-action="upvote" title="">

<span class="updatable count" data-role="likes">3</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1720623333">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1720623333">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1720686448"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/asmerkin/" class="user" data-action="profile" data-username="asmerkin">
<img data-role="user-avatar" data-user="112673" src="avatar92(1).jpg" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/asmerkin/" data-action="profile" data-username="asmerkin" data-role="username">Andrés Smerkin</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1720686448" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 3:24 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Very good article :) Thank you!</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-1" data-action="upvote" title="">

<span class="updatable count" data-role="likes">1</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1720686448">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1720686448">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1720252533"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/tyroneavnit/" class="user" data-action="profile" data-username="tyroneavnit">
<img data-role="user-avatar" data-user="44494479" src="avatar92(2).jpg" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/tyroneavnit/" data-action="profile" data-username="tyroneavnit" data-role="username">Tyrone Avnit</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1720252533" data-role="relative-time" class="time-ago" title="Monday, December 1, 2014 10:41 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Great article with great tips. Thank you.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-1" data-action="upvote" title="">

<span class="updatable count" data-role="likes">1</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1720252533">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1720252533">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1769300739"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/samuelimolorhe/" class="user" data-action="profile" data-username="samuelimolorhe">
<img data-role="user-avatar" data-user="137813143" src="avatar92(3).jpg" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/samuelimolorhe/" data-action="profile" data-username="samuelimolorhe" data-role="username">Samuel Imolorhe</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1769300739" data-role="relative-time" class="time-ago" title="Saturday, January 3, 2015 8:22 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Hi. Lovely article! Been looking for something like this for a while now. Currently using the git-flow feature in Bitbucket's SourceTree as a way to take care of any mistakes that any of the developers could make. However, it seems to ensure that the workflow is exactly the way Vincent Driessen defined it to be in his article. Just need to get another opinion on this. Specifically because it doesn't enforce pull requests, which I would love, or the ability to have phase-specific branches in a multi-phased rollout. However, we just started using Git recently and most of the developers are still trying to get the hang of it, hence the decision to use the git-flow feature to ease the process. Thanks.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1769300739">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1769300739">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1736743953"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/marioaraque/" class="user" data-action="profile" data-username="marioaraque">
<img data-role="user-avatar" data-user="51318756" src="avatar92(4).jpg" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/marioaraque/" data-action="profile" data-username="marioaraque" data-role="username">Mario Araque</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1736743953" data-role="relative-time" class="time-ago" title="Thursday, December 11, 2014 10:07 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Very nice article!</p><p>I have a question about code review, what do you think about rebase after you get the "+1" (or thumbs up). It's very common to do commits in my branch, and then rebase it into one after "+1". The result is only one commit per feature.</p><p>Regards.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1736743953">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1736743953">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1763979592"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/redhotvengeance/" class="user" data-action="profile" data-username="redhotvengeance">
<img data-role="user-avatar" data-user="27772796" src="avatar92(5).jpg" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/redhotvengeance/" data-action="profile" data-username="redhotvengeance" data-role="username">Ian Lollar</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1736743953" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> Mario Araque</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1763979592" data-role="relative-time" class="time-ago" title="Tuesday, December 30, 2014 10:22 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Sure, you could do that. Ultimately, the PR branch is going to be thrown away anyway. But the key is that you'll be doing it with the understanding that no one else is working in the PR branch, otherwise they will be dealing with a rewritten history and likely not thank you for that ;)</p><p>Sounds like you may also be squashing your commits so that each feature winds up as a single commit. That's certainly a viable flow. I prefer each commit to focused on a single task. If a new feature is very small, then it could easily be a single commit. On the other hand, a larger feature is likely made up of many sub-tasks, and I would have each of those sub-tasks be their own commit. This is a personal preference - I just think it makes for an easier time when looking at commit diffs.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1763979592">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1763979592">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li></ul>

</li><li class="post" id="post-1727819521"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/disqus_VoAsAbTaXv/" class="user" data-action="profile" data-username="disqus_VoAsAbTaXv">
<img data-role="user-avatar" data-user="134605188" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/disqus_VoAsAbTaXv/" data-action="profile" data-username="disqus_VoAsAbTaXv" data-role="username">Akin T.</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1727819521" data-role="relative-time" class="time-ago" title="Saturday, December 6, 2014 5:14 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Nice! That's what I've been looking for...</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1727819521">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1727819521">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1725587814"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/evanmcd/" class="user" data-action="profile" data-username="evanmcd">
<img data-role="user-avatar" data-user="19930354" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/evanmcd/" data-action="profile" data-username="evanmcd" data-role="username">evanmcd</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1725587814" data-role="relative-time" class="time-ago" title="Friday, December 5, 2014 12:25 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Thanks for a great article.</p><p>It's probably my lack of understanding, but wouldn't creating feature branches of dev mean that code that may not be ready for production get deployed?  e.g. dev 1 creates feature A and merges with develop branch; dev 2 creates feature B off of develop; feature B is ready before feature A, but since feature B came off of develop where feature B existed it gets merged to master along with feature B?</p><p>My guess is that you've accounted for that in this flow, but I'm not clear how.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1725587814">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1725587814">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1726216347"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/redhotvengeance/" class="user" data-action="profile" data-username="redhotvengeance">
<img data-role="user-avatar" data-user="27772796" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/redhotvengeance/" data-action="profile" data-username="redhotvengeance" data-role="username">Ian Lollar</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1725587814" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> evanmcd</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1726216347" data-role="relative-time" class="time-ago" title="Friday, December 5, 2014 6:48 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>As with all things, team communication is key. If you are currently working on a multi-phased rollout (wherein certain features are being slated for specific releases), immediately merging all feature branches into develop would be an improper flow. Instead, I'd suggest a couple of alternative options:</p><p>1. Keep new features not slated for the next release in their feature branches, and don't merge until that feature is "on deck" for release. In this instance, you should definitely be pushing those feature branches to the remote, if for no other reason than to have them backed up.<br>2. Forgo having a single "develop" branch, and instead have phase-specific branches that serve as the trunk for that specific phase. As you move from one phase to the other, alert the team as to when they should start merging into the next phase's branch, and then retire phase branches that have been shipped.</p><p>A worthwhile modification to the first option is to include a strongly pull request-based flow, wherein all merges must be initiated by a pull request, and only key team members can approve the merge. That way someone keeping an eye on product roadmap at large can appropriately authorize when a new feature should be merged into develop.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1726216347">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1726216347">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li></ul>

</li><li class="post" id="post-1725116118"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/davetgreen/" class="user" data-action="profile" data-username="davetgreen">
<img data-role="user-avatar" data-user="4460233" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/davetgreen/" data-action="profile" data-username="davetgreen" data-role="username">Dave Green</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1725116118" data-role="relative-time" class="time-ago" title="Thursday, December 4, 2014 5:21 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Brilliant read. I've always been ensure as to what the best approach is so this has cleared that up for good. Cheers!</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1725116118">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1725116118">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1723225123"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/ds1982/" class="user" data-action="profile" data-username="ds1982">
<img data-role="user-avatar" data-user="31904915" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/ds1982/" data-action="profile" data-username="ds1982" data-role="username">ds1982</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1723225123" data-role="relative-time" class="time-ago" title="Wednesday, December 3, 2014 2:44 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>&gt; git merge --no-ff develop</p><p>I highly disagree with this. This way, git creates a "real" merge commit what is usually not what you want if you work with a rebase-based workflow. We even configured our gitolite in a way, that it rejects all pushes with merge commits. This makes it easier to ensure that everybody rebases..</p><p>If you need a commit that marks your merge (we need that sometimes, too), we make an empty commit:</p><p>git commit --allow-empty -m "merge feature hash1..hash2"</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1723225123">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1723225123">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li><li class="post" id="post-1722371838"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/davidm777/" class="user" data-action="profile" data-username="davidm777">
<img data-role="user-avatar" data-user="23118454" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/davidm777/" data-action="profile" data-username="davidm777" data-role="username">davidm777</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722371838" data-role="relative-time" class="time-ago" title="Wednesday, December 3, 2014 2:39 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Wow - super well written article.  Very easy to read and understand.  I *really* appreciate the sample git commands as I have to (currently) work in a variety of VCSs, I don't always remember each system's commands.</p><p>I do have a question.  You wrote, "The following example is based on a very popular Git workflow crafted by Vincent Driessen called Git-Flow, though it differs in certain key ways."  Can you elaborate on the "certain key ways" as I am not really seeing any (which is why I need your elaboration - grin)?</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722371838">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1722371838">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1722449568"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/redhotvengeance/" class="user" data-action="profile" data-username="redhotvengeance">
<img data-role="user-avatar" data-user="27772796" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/redhotvengeance/" data-action="profile" data-username="redhotvengeance" data-role="username">Ian Lollar</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722371838" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> davidm777</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722449568" data-role="relative-time" class="time-ago" title="Wednesday, December 3, 2014 3:27 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Yeah, "key ways" may be a bit misleading, in retrospect. "Subtle ways" is probably more accurate. This tut introduces some flexibility by dropping the need for release branches and loosening up naming guidelines. It also outlines commit message conventions, semantic versioning, and encourages rebasing, which was left out of Vincent Driessen's Git-Flow. And there's a bit on pull request workflows, as well. But the core principles are from Git-Flow. Good eye :)</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722449568">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1722449568">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1722518035"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/davidm777/" class="user" data-action="profile" data-username="davidm777">
<img data-role="user-avatar" data-user="23118454" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/davidm777/" data-action="profile" data-username="davidm777" data-role="username">davidm777</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722449568" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> Ian Lollar</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722518035" data-role="relative-time" class="time-ago" title="Wednesday, December 3, 2014 4:08 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Excellent!  Thank you for the quick reply.  I would suggest that your approach is less overwhelming for those of us who haven't done anything like this :-)  Thus my assessment "Very easy to read and understand"!</p><p>Thanks again for this article!</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1722518035">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1722518035">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li></ul>

</li></ul>

</li><li class="post" id="post-1721366179"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/disqus_ZdYsl4dxH8/" class="user" data-action="profile" data-username="disqus_ZdYsl4dxH8">
<img data-role="user-avatar" data-user="56006994" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/disqus_ZdYsl4dxH8/" data-action="profile" data-username="disqus_ZdYsl4dxH8" data-role="username">Ngoc Phan</a></span>

</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721366179" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 11:48 AM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>very nice, but I am not clear at one point.</p><p>"All conflict resolution should happen in your feature branch. If you branched to make a small change/fix and you have not pushed the branch to the remote,....."</p><p>what does it mean "not pushed the branch to the remote" ? is "the remote" here the feature branch on remote? or develop branch on the remote in case I already rebased my local feature branch to develop and push to develop on the remote.</p><p>Thanks</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721366179">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1721366179">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1721492855"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/redhotvengeance/" class="user" data-action="profile" data-username="redhotvengeance">
<img data-role="user-avatar" data-user="27772796" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/redhotvengeance/" data-action="profile" data-username="redhotvengeance" data-role="username">Ian Lollar</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721366179" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> Ngoc Phan</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721492855" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 2:20 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>The "remote" is whatever server/service you're syncing your Git repo to (this article focused on BitBucket, but it could also be GitHub or any other Git hosting service, or even a personal Git server you may have set up). The passage you're questioning is saying this:</p><p>Let's say you're sitting on the develop branch and you want to add a new feature. So you make a new branch (let's call it "my-new-feature") and switch to it. After working on the feature and making one or more commits, the feature is now done and ready to be merged. In its current state, the my-new-feature branch is only local, since you have not pushed it (git push origin my-new-feature). Since it is only local, you can safely rebase it (while sitting on the my-new-feature branch, git rebase develop). Then you can switch back over to the develop branch, merge my-new-feature, and push the new commits on the develop branch.</p><p>Let me know if you have any other questions!</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721492855">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1721492855">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1721527532"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/disqus_ZdYsl4dxH8/" class="user" data-action="profile" data-username="disqus_ZdYsl4dxH8">
<img data-role="user-avatar" data-user="56006994" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/disqus_ZdYsl4dxH8/" data-action="profile" data-username="disqus_ZdYsl4dxH8" data-role="username">Ngoc Phan</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721492855" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> Ian Lollar</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721527532" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 3:11 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>And then  I found that I want to add some more things let's say functions to my-new-feature branch. I checkout to it, and make changes. then can I still rebase develop to my-new-feature?</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721527532">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1721527532">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1721536725"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/redhotvengeance/" class="user" data-action="profile" data-username="redhotvengeance">
<img data-role="user-avatar" data-user="27772796" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/redhotvengeance/" data-action="profile" data-username="redhotvengeance" data-role="username">Ian Lollar</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721527532" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> Ngoc Phan</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721536725" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 3:23 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>Sure. So long as you haven't actually pushed my-new-feature to the remote, then that's fine. Look at it this way: you should never execute a rebase while sitting on any branch that also exists on the remote. If you're sitting on master, then no rebasing, because master exists on the remote. Same with develop (if you're following the workflow in this tut). But since my-new-feature doesn't exist on the remote (since you haven't pushed it yet), then you can rebase.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721536725">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1721536725">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"><li class="post" id="post-1721592109"><div role="alert"></div>
<div data-role="post-content" class="post-content">
<ul class="post-menu dropdown" data-role="menu">
<li class="collapse">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Collapse"><span>−</span></a>
</li>
<li class="expand">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="collapse" title="Expand"><span>+</span></a>
</li>

<li class="" role="menu">
<a class="dropdown-toggle" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="flag" data-role="flag" title="Flag as inappropriate">
<i aria-hidden="true" class="icon icon-flag"></i>
</a>
</li>
</ul>
<div class="indicator"></div>

<div class="avatar hovercard">
<a href="https://disqus.com/by/disqus_ZdYsl4dxH8/" class="user" data-action="profile" data-username="disqus_ZdYsl4dxH8">
<img data-role="user-avatar" data-user="56006994" src="noavatar92.png" alt="Avatar">
</a>
</div>
<div class="post-body">
<header>
<span class="post-byline">
<span class="author publisher-anchor-color"><a href="https://disqus.com/by/disqus_ZdYsl4dxH8/" data-action="profile" data-username="disqus_ZdYsl4dxH8" data-role="username">Ngoc Phan</a></span>

<span><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721536725" class="parent-link" data-role="parent-link"><i aria-hidden="true" class="icon-forward" title="in reply to"></i> Ian Lollar</a></span>
</span>

<span class="post-meta">
<span class="bullet time-ago-bullet" aria-hidden="true">•</span>

<a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721592109" data-role="relative-time" class="time-ago" title="Tuesday, December 2, 2014 4:41 PM">a year ago</a>
</span>

</header>

<div class="post-body-inner">
<div class="post-message-container" data-role="message-container">
<div class="publisher-anchor-color" data-role="message-content">
<div class="post-message " data-role="message" dir="auto">
<p>thank you very very very much. Now it is clear for me.</p>
</div>

<span class="post-media"><ul data-role="post-media-list"></ul></span>
</div>
</div>
<a class="see-more hidden" title="see more" data-action="see-more">see more</a>
</div>

<footer>
<menu>

<li class="voting" data-role="voting">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="vote-up  count-0" data-action="upvote" title="Vote up">

<span class="updatable count" data-role="likes">0</span>
<span class="control"><i aria-hidden="true" class="icon icon-arrow-2"></i></span>
</a>
<span role="button" class="vote-down  count-0" data-action="downvote" title="Vote down">

<span class="control"><i aria-hidden="true" class="icon icon-arrow"></i></span>
</span>
</li>
<li class="bullet" aria-hidden="true">•</li>


<li class="reply" data-role="reply-link">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="reply">
<i class="icon icon-mobile icon-reply"></i><span class="text">Reply</span></a></li>
<li class="bullet" aria-hidden="true">•</li>


<li class="share">
<a class="toggle"><i class="icon icon-mobile icon-share"></i><span class="text">Share ›</span></a>
<ul>
<li class="twitter"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:twitter">Twitter</a></li>
<li class="facebook"><a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="share:facebook">Facebook</a></li>
<li class="link"><a href="http://code.tutsplus.com/tutorials/focusing-on-a-team-workflow-with-git--cms-22514#comment-1721592109">Link</a></li>
</ul>
</li>

<li class="realtime" data-role="realtime-notification:1721592109">
<span style="display:none;" class="realtime-replies"></span>
<a style="display:none;" href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" class="btn btn-small"></a>
</li>

</menu>
</footer>
</div>

<div data-role="blacklist-form"></div>
<div class="reply-form-container" data-role="reply-form"></div>
</div>

<ul data-role="children" class="children"></ul>

</li></ul>

</li></ul>

</li></ul>

</li></ul>

</li></ul>

<div class="load-more" data-role="more" style="display:none">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" data-action="more-posts" class="btn">Load more comments</a>
</div>
</div>

</section>

<div id="placement-bottom" data-tracking-area="discovery-south"><div class="post-list" style="height: 0px; visibility: hidden;"></div></div>

<div id="footer" data-tracking-area="footer">
<ul class="disqus-footer">
<li class="logo disqus-footer__item"><a href="https://disqus.com/" rel="nofollow" title="Powered by Disqus">Powered by Disqus</a></li>
<li id="thread-subscribe-button" class="email disqus-footer__item"> 
<div class="default">
<a href="http://disqus.com/embed/comments/?base=default&version=4aca534a0baee76617eb115212993522&f=tutshub&t_i=22514&t_u=http%3A%2F%2Fcode.tutsplus.com%2Ftutorials%2Ffocusing-on-a-team-workflow-with-git--cms-22514&t_e=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_d=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_t=Focusing%20on%20a%20Team%20Workflow%20With%20Git&t_c=3496021&s_o=default&l=en#" rel="nofollow" data-action="subscribe" title="Subscribe and get email updates from this discussion"><i aria-hidden="true" class="icon icon-mail"></i><span class="clip">Subscribe</span> <i aria-hidden="true" class="icon icon-checkmark"></i></a>
</div>
<div class="form">
<div class="input-wrapper"><input id="thread-subscribe-email" type="email" placeholder="yourname@email.com"></div>
</div>
</li>
<li class="install disqus-footer__item">
<a href="https://publishers.disqus.com/engage?utm_source=tutshub&utm_medium=Disqus-Footer" rel="nofollow" target="_blank">
<i aria-hidden="true" class="icon icon-disqus"></i>
<span class="clip hidden-sm">Add Disqus to your site</span>
<span class="clip visible-sm hidden-xs">Add Disqus</span>
<span class="clip visible-xs">Add</span>
</a>
</li>
<li class="privacy disqus-footer__item">
<a href="https://help.disqus.com/customer/portal/articles/1657951?utm_source=disqus&utm_medium=embed-footer&utm_content=privacy-btn" rel="nofollow" target="_blank">
<i aria-hidden="true" class="icon icon-lock"></i>
<span class="clip">Privacy</span>
</a>
</li>
</ul>
</div>
</div><img src="saved_resource" style="display: none;"><img src="p-94WKwgUwZHlfo.gif" style="display: none;"><img src="learn" style="display: none;"><iframe src="sync.html" style="display: none;"></iframe></body></html>